s/bands/components/

diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 4e6442aa484b341cdc064e74163278194c67ec08..0b2961fd8797c2e4f87fc7b0ed07e9667c06edb5 100644 (file)
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -251,20 +251,20 @@ babl_conversion_planar_process (BablConversion *conversion,
                                 long            n)
 {
 #ifdef USE_ALLOCA
-  void **src_data = alloca (sizeof (void*) * source->bands);
-  void **dst_data = alloca (sizeof (void*) * destination->bands);
+  void **src_data = alloca (sizeof (void*) * source->components);
+  void **dst_data = alloca (sizeof (void*) * destination->components);
 #else 
   void *src_data[BABL_MAX_COMPONENTS];
   void *dst_data[BABL_MAX_COMPONENTS];
 #endif
 
-  memcpy (src_data, source->data, sizeof (void*) * source->bands);
-  memcpy (dst_data, destination->data, sizeof (void*) * destination->bands);
+  memcpy (src_data, source->data, sizeof (void*) * source->components);
+  memcpy (dst_data, destination->data, sizeof (void*) * destination->components);
   
-  conversion->function.planar (source->bands,
+  conversion->function.planar (source->components,
                                src_data,
                                source->pitch,
-                               destination->bands,
+                               destination->components,
                                dst_data,
                                destination->pitch,
                                n);

diff --git a/babl/babl-image.h b/babl/babl-image.h
index 31b6750c6ca5afbeb0a6c30c2a531ce1b4181fa5..799be04e2ae09bd4939bce022de73a9232fc6d51 100644 (file)
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -27,8 +27,8 @@
  *
  * NB: babl_fish_process () frees the images passed in by itself.
  */
-Babl * babl_image_new             (void *first_component,
-                                   ...);
+Babl * babl_image             (void *first_component,
+                               ...);
 
 /* create a new BablImage based on a packed BablFormat (or BablModel which
  * is a virtual pixelformat based on the BablModel using only doubles in the